From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 9 May 2016 17:59:29 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~2995
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9418ab39bf970dd82b5d6f2e7b40a5d8cd134a43;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

c760a60 tramp-sh.el: Work around a stat bug (backport from master)
---

9418ab39bf970dd82b5d6f2e7b40a5d8cd134a43